Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / domain / Booking.java

diff --git a/ruralHouses client/src/domain/Booking.java b/ruralHouses client/src/domain/Booking.java
new file mode 100644 (file)
index 0000000..0f72a6c
--- /dev/null
+++ b/ruralHouses client/src/domain/Booking.java
@@ -0,0 +1,86 @@
+package domain;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Booking implements Serializable  {
+
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
+       private int bookingNumber;
+       private boolean isPaid;
+       private Date bookingDate;
+       private Client client;
+       private Offer offer;
+       
+       
+       public Booking() {
+       }
+
+       public Booking(int bN , Offer offer,Client client) {
+               
+               this.bookingNumber = bN;
+               this.offer = offer;
+               this.client=client;
+               //Booking date is assigned to actual date
+               this.bookingDate= new java.util.Date(System.currentTimeMillis());
+               this.isPaid=false;
+       }
+       
+       public void imprimete(){
+               System.out.println(bookingNumber);
+               System.out.println(isPaid);
+               System.out.println(bookingDate);
+               System.out.println(client.toString());
+               System.out.println(offer);      
+       }
+
+       public int getBookNumber() {
+               return this.bookingNumber;
+       }
+
+       public void setOffer(Offer offer) {
+               this.offer = offer;
+       }
+
+       public Offer getOffer() {
+               return this.offer;
+       }
+
+       public float getPrice() {
+               return this.offer.getPrice();
+       }
+       
+       public void setBookDate(Date bookDate) {
+               this.bookingDate = bookDate;
+       }
+
+       public Date getBookDate() {
+               return this.bookingDate;
+       }
+       
+       public void paid() {
+               this.isPaid = true;
+       }
+
+       public void notPaid() {
+               this.isPaid=false;
+       }
+
+       public boolean isPaid() {
+               return isPaid;
+       }
+       
+
+
+       public Client getClient() {
+               return client;
+       }
+
+       public void setClient(Client client) {
+               this.client = client;
+       }
+       
+}
\ No newline at end of file